Pull request for issue #716

Fixes #716. Generated by conveyor-workflow.