Pull request for issue #338

Fixes #338. Generated by conveyor-workflow.