merge from jenkins trunk