Try to fix travis.
Nothing to fix there.
Quick fix for pulls
Merge branch 'release/1.2.1'