Pull request for issue #1041

Fixes #1041. Generated by conveyor-workflow.