Pull request for issue #1345

Fixes #1345. Generated by conveyor-workflow.