Fix sad Travis.
Merge branch 'dev-master' into route-editable

* dev-master:
  Fix sad Travis.