Release

[Cameron McKenzie]

Guys,
I guess it's time for a release. 2.12.0 or 2.11.2? And 3.3.0?

Any other fixes that need to go in before I get started?
cheers