Pull request for issue #656

Fixes #656. Generated by conveyor-workflow.