Pull request for issue #380

Fixes #380. Generated by conveyor-workflow.