Pull request for issue #352

Fixes #352. Generated by conveyor-workflow.