Pull request for issue #308

Fixes #308. Generated by conveyor-workflow.