Pull request for issue #1263

Fixes #1263. Generated by conveyor-workflow.