Pull request for issue #1405

Fixes #1405. Generated by conveyor-workflow.