Pull request for issue #300

Fixes #300. Generated by conveyor-workflow.