Pull request for issue #1331

Fixes #1331. Generated by conveyor-workflow.