Merge "Pull submodules when running tox"