Enable -Werror in Travis builds
Merge branch '2.4'