Tracking 2.5.x branch, + travis patches