Fixing travis builds. Thnx @Seldaek
Merge branch '1.7' into 1.8
Merge branch '1.8'