Pull request for issue #370

Fixes #370. Generated by conveyor-workflow.