Bug #809105

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