Pull request for issue #348

Fixes #348. Generated by conveyor-workflow.