Glad to hear you are sorted.

Whenever I switch between ('major') branches, I issue:
Code:
git submodule update --init
to be on the safe side. Having to do this at all seems to be a flaw in git, IMHO.