Bug #837013

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