Update to Foundation 5.2.1
Merge branch 'github.com/master'