Pull request for issue #1341

Fixes #1341. Generated by conveyor-workflow.