Merge conflicts
Merge branch 'master' of https://github.com/bandola/jenkins-desktop-monitor