Cleanup for 1.8.7 syntax.
Re-enable 1.8.7 in travis.
Merge remote-tracking branch 'origin/master'

* origin/master:
  Fix some typos