Pull request for issue #269

Fixes #269. Generated by conveyor-workflow.