Merge in upstream changes (Foundation 5.2.2)

@thinkerous this merged in without any conflicts, and is so far looking good to me on a site that uses a number of Foundation components