Pull request for issue #1159

Fixes #1159. Generated by conveyor-workflow.