Merge hopefully happy submodule version into master