Pull request for issue #613

Fixes #613. Generated by conveyor-workflow.