update submodules
Merge branch 'master' into feb12-deploy