Pull request for issue #261

Fixes #261. Generated by conveyor-workflow.