Update to Foundation 5.2.1
Fixed issues with older versions of CodeKit
merge from upstream master