Bug #776887

Change-Id: I48de3e5386e6d7ce128b3b57b54ce1efcbe08b18
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>