Pull request for issue #1201

Fixes #1201. Generated by conveyor-workflow.