Merge branch 'ignore-tilde'
Pull from my fork so we can test my builds.
Use my fork as submodule.