Merge branch 'master' of /Users/Jojo/pingpoint with conflicts.