Pull request for issue #1337

Fixes #1337. Generated by conveyor-workflow.