matthewgraybosch Merge branch 'master' of https://github.com/matthewgraybosch/desktop-… …