merge jenkins trunk