enable builds on xcode 5.1
Merge remote-tracking branch 'origin/master' into show-plist-in-finder