Consider patch release branch: Gherkin glitches

[ashleyfrieze]

trafficstars

Fixes for inconsistencies in hook and configuration behaviour with Gherkin Syntax

[greghaskins]

@ashleyfrieze I will merge this, but there's a small conflict with master now. Sorry I let this PR sit out here way too long!