Fix travis take 2
Merge branch 'master' into librocket