fix travis
Merge branch '1.2.x'