Pull request for issue #318

Fixes #318. Generated by conveyor-workflow.