Fix travis.
Fix travis again.
Ok. Im tired.
Merge branch 'release/1.1.1'