Bug #1041645

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