Pull request for issue #1241

Fixes #1241. Generated by conveyor-workflow.