Fix for Xcode 6.1.1 6A2008a.
Merge branch 'master' into db