Bug #826453

Change-Id: I1e6c102b67ad0342a1d91494e84f74617722db93
Signed-off-by: Eugene Venter <eugene@catalyst.net.nz>