Pull request for issue #1253

Fixes #1253. Generated by conveyor-workflow.