Initial merge of 4.0.0 final (still things to resolve)
Resolved most merging issues
Official release of 4.0.0 for OS X