Core Master branch now targets 3.6.0

[Stephen Connolly]

I'd rather not roll any more features in 3.5.x... let's go for 3.6.0 for
now and consider moving to 4.0.0 once we have the tooling we need for the
Java 8 refactoring in place