Bug1183612

Change-Id: I458cfd08a0326f3e21aefe656e00bcdeb6c85bbc
Signed-off-by: Aaron Wells <aaronw@catalyst.net.nz>