Patch for 4.8?
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>