Pull request for issue #472

Fixes #472. Generated by conveyor-workflow.