Pull request for issue #464

Fixes #464. Generated by conveyor-workflow.