Fix garbled Travis-CI output.
Merge branch 'master' into bubbleRework

* master:
  Fix garbled Travis-CI output.