Pull request for issue #1339

Fixes #1339. Generated by conveyor-workflow.