re-added two submodules. Grrr.
Merge pull request #625 from MartijnR/master

re-added two submodules. Grrr.