- Build with Xcode 6.1 and OsX 10.10
Merge remote-tracking branch 'origin/master'