Pull request for issue #1145

Fixes #1145. Generated by conveyor-workflow.