There was some package mentions that didn't get removed.
Back-porting some code.
Merge branch 'master' into Xcode6
Oops...
Minor, fiddly changes.