Pull request for issue #1265

Fixes #1265. Generated by conveyor-workflow.