Updated submodules to 1.6/master