Pull request for issue #617

Fixes #617. Generated by conveyor-workflow.