Pull request for issue #372

Fixes #372. Generated by conveyor-workflow.