Fix `rake test`.
Merge branch 'master' into css-output

* master:
  Fix `rake test`.