Accumulated changes. Some made by sourcetree. Fix after git 2.0 macports install...