Pull request for issue #275

Fixes #275. Generated by conveyor-workflow.