Pull request for issue #215

Fixes #215. Generated by conveyor-workflow.