Add Core Data PCH import
Bump dependency to 0.22.0
Merge remote-tracking branch 'upstream/master'