Pull request for issue #484

Fixes #484. Generated by conveyor-workflow.