base: fixes travis
Merge branch '1.0.x' into 1.1.x

* 1.0.x:
  base: fixes travis
Merge branch '1.1.x' into 1.2.x

* 1.1.x:
  base: fixes travis