travis: fix duplicate line problem
Merge remote-tracking branch 'origin/master' into release-1.2.x