updated submodules; fixed incompatibilities with 1.8/develop