Pull request for issue #366

Fixes #366. Generated by conveyor-workflow.