Pull request for issue #386

Fixes #386. Generated by conveyor-workflow.