Drop the symlink.  Travis can't submodule.
Update submodule URL for travis.
Drop symlink again.
Merge branch 'master' into app-emulation/fig