upgrade to v3.8
Merge branch 'master' into production by francis