Pull request for issue #1049

Fixes #1049. Generated by conveyor-workflow.