Pull request for issue #273

Fixes #273. Generated by conveyor-workflow.