Merge remote-tracking branch 'upstream/master' into Try-without-grease

Author: brendon

.travis.yml

@@ -5,9 +5,10 @@ rvm:
  - 1.9.3-p551
  - 2.0.0-p648
  - 2.1.10
- - 2.2.7
- - 2.3.4
- - 2.4.1
+ - 2.2.9
+ - 2.3.6
+ - 2.4.3
+ - 2.5.0
  - jruby-9.1.9.0
 before_install:
  - gem install bundler
@@ -32,9 +33,15 @@ matrix:
  gemfile: gemfiles/rails50.gemfile
  - rvm: 2.1.10
  gemfile: gemfiles/rails51.gemfile
- - rvm: 2.4.1
+ - rvm: 2.4.3
  gemfile: gemfiles/sprockets2.gemfile
- - rvm: 2.4.1
+ - rvm: 2.4.3
  gemfile: gemfiles/rails40.gemfile
- - rvm: 2.4.1
+ - rvm: 2.4.3
+ gemfile: gemfiles/rails41.gemfile
+ - rvm: 2.5.0
+ gemfile: gemfiles/sprockets2.gemfile
+ - rvm: 2.5.0
+ gemfile: gemfiles/rails40.gemfile
+ - rvm: 2.5.0
  gemfile: gemfiles/rails41.gemfile