Pull request for issue #362

Fixes #362. Generated by conveyor-workflow.