Merge tag 'upstream/2.5.1'

Upstream version 2.5.1

Author: sorah

.travis.yml

@@ -88,7 +88,9 @@ notifications:
       - "%{message} by @%{author}: See %{build_url}"
 
   slack:
-    secure: TNRGiWGytGSLDAjJLR0NVXKlHhba6Kf584wU7mXqiOCDNBQ0LHUsrIMaL38uvpnzQ6NeV5j5k575LAZyuGXKczSrOTeIBJaHfw6Wj/8WUnifnNcIFozZ5DH9/S2EuiVcslDmoRflOFSTkocpE0MElt2KU2kNCzeq3/iVatNT8Nw=
+    rooms:
+      - secure: i1GLETSKye85ea6dGNA3MxI/5myChmMFiZtBd5C69xK+s1sBFqEgOSbaSf9KHc0CYrHVyNhQMaZRruieV7xS+6Pfs0Zvxf1DO6QQTWC2KhkqwFDLvZncAzjoyASdR90hbr+iRPOngQ+HJuE94zemALAwEqNAinzA74PMiJXktqY= # ruby:<token>#commits
+      - secure: ah7UEHBvncXT7bM5mvYIQAO+tIyV/wl7nXLb7wQD16dO2v8Gragy0mWjB79Q09hrrMGmp6H9bCDpdGS80boIA5EHaHoG4QaP0i9bsSt8U2AMWgZtfyIgQKJ4H2kXkGlrjO+AXTgnIkP7LNjdgAVUUTGQPb26T3QmoN2Splt+fIQ= # ruby:<token>#alerts
     on_pull_requests: false
     on_success: change
     on_failure: always