Pull request for issue #1149

Fixes #1149. Generated by conveyor-workflow.