Revert "update submodule refs"

This reverts commit 9a075628db485006547205fd41bbcd5fb602b861.
update submodule refs
Merge branch 'master' into staging2