refactor; no functional changes
Merge branch 'master' of github.com:desktop/desktop.github.com