Upgrade Dotbot
Merge branch 'master' into linux-desktop