Robert Lyon authored Sep 30, 2013 and Aaron Wells committed Oct 14, 2013

- have added this as a separate patch in case it is not needed

Change-Id: I87378a0d831727c405cc6135ba6f6e5e4a722813
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>