Pull request for issue #1205

Fixes #1205. Generated by conveyor-workflow.