Merge branches 'hfi1' and 'sge-limit' into k.o/for-4.8-2