Pull request for issue #615

Fixes #615. Generated by conveyor-workflow.