merges from jenkins-motd-tail\ -\ upstream