Pull request for issue #1311

Fixes #1311. Generated by conveyor-workflow.