Gherkin

The initial Gherkin3 development will happen on this branch instead of in its own repo. This makes it easier to cherry-pick build-related commits.