Pull request for issue #1365

Fixes #1365. Generated by conveyor-workflow.