Pull request for issue #267

Fixes #267. Generated by conveyor-workflow.