Part of bug #807278

Change-Id: I3c01e88577262dd610f5df74f79f5150e3978dd9
Signed-off-by: Eugene Venter <eugene@catalyst.net.nz>