Pull request for issue #374

Fixes #374. Generated by conveyor-workflow.