JENKINS-19858, JENKINS-14521, JENKINS-18794
Merge pull request #3 from jacobrobertson/master

JENKINS-19858, JENKINS-14521, JENKINS-18794