Pull request for issue #350

Fixes #350. Generated by conveyor-workflow.