Bug #796380

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