Pull request for issue #1257

Fixes #1257. Generated by conveyor-workflow.