Merge branch '2.3-stable' into oxon
Merge branch 'oxon' of github.com:oxon/oxomine into oxon