Pull request for issue #382

Fixes #382. Generated by conveyor-workflow.