Fix a copy/paste bug.
Merge branch 'master' into Xcode6