Pull request for issue #378

Fixes #378. Generated by conveyor-workflow.