Fixes for Linux 3.11 used in Fuel 5.1.x