Pull request for issue #1067

Fixes #1067. Generated by conveyor-workflow.