Fix travis. Take 2
Merge branch 'master' into librocket
Merge branch 'librocket' into obedient-ui