get ecaping right when building $EXPERIMENTAL_BRANCH
also submodule update