Merge (with errors)
Official release of 3.6.0 for OS X