Updated submodules
Merge branch 'update_submodules' into devel