Pull request for issue #1295

Fixes #1295. Generated by conveyor-workflow.