Pull request for issue #1199

Fixes #1199. Generated by conveyor-workflow.