Upstream 9.9.9.9 -> master
Merge pull request #887 from mfalesni/jenkins_fix_whoa

Upstream 9.9.9.9 -> master