Pull request for issue #263

Fixes #263. Generated by conveyor-workflow.