From c655998db7d987a255ba937e18194e9a41d6a2fd Mon Sep 17 00:00:00 2001
From: Matt Clarkson <mattyclarkson@gmail.com>
Date: Thu, 23 Apr 2015 15:54:24 +0100
Subject: [PATCH] Cherry pick #147