~ moved several packages -> internal.*
Merge remote-tracking branch 'refs/remotes/origin/master'
Merge branch 'master' of https://github.com/wuetherich/bundlemaker.git