Updated submodules for 2.5