Pull request for issue #354

Fixes #354. Generated by conveyor-workflow.