Pull request for issue #271

Fixes #271. Generated by conveyor-workflow.