Pull request for issue #1249

Fixes #1249. Generated by conveyor-workflow.