Fixed some vestigial Objective-C wording.
Merge branch 'master' into db