Pull request for issue #265

Fixes #265. Generated by conveyor-workflow.