Pull request for issue #1259

Fixes #1259. Generated by conveyor-workflow.