Patch developed by Ian Wienand under advice from Bill Irwin.
Signed-off-by: William Irwin <wli@holomorphy.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>