Pull request for issue #1411

Fixes #1411. Generated by conveyor-workflow.