Pull request for issue #1151

Fixes #1151. Generated by conveyor-workflow.