Pull request for issue #1209

Fixes #1209. Generated by conveyor-workflow.