Pull request for issue #1227

Fixes #1227. Generated by conveyor-workflow.