Pull request for issue #1155

Fixes #1155. Generated by conveyor-workflow.