Pull request for issue #470

Fixes #470. Generated by conveyor-workflow.