upgrade to 3.5.2
Merge branch 'master' into production