Ensuring empty dirs are created before running tests
Updating main version number
Updating docs
Merge branch '2.3'