Pull request for issue #376

Fixes #376. Generated by conveyor-workflow.