Pull request for issue #1267

Fixes #1267. Generated by conveyor-workflow.