Pull request for issue #1153

Fixes #1153. Generated by conveyor-workflow.