Pull request for issue #1335

Fixes #1335. Generated by conveyor-workflow.