trigger travis-ci
Revert "trigger travis-ci"

This reverts commit 25c2a6661eab74838bfa1e32fb7cfef6f496bac0.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT