Bug #779251

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