Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
(cherry picked from commit 3dcea251)