Pull request for issue #1261

Fixes #1261. Generated by conveyor-workflow.