Pull request for issue #404

Fixes #404. Generated by conveyor-workflow.