Pull request for issue #1251

Fixes #1251. Generated by conveyor-workflow.