Pull request for issue #474

Fixes #474. Generated by conveyor-workflow.