Merge "Updates to git submodule references"