e4e76f28 Merge branch 'master' into osx-CFBundle-info-plist 149ce5db OS X: Fix Info.plist placement in a CFBundle
e4e76f28
149ce5db