[Bug] Travis gets very clogged so we should probably have some more patience with it
Merge branch 'master' into develop