More in travis
Merge branch 'master' into development