Merge branch 'master' into Xcode6