Pull request for issue #1181

Fixes #1181. Generated by conveyor-workflow.