Pull request for issue #1305

Fixes #1305. Generated by conveyor-workflow.