Pull request for issue #646

Fixes #646. Generated by conveyor-workflow.