Travis
Reformat to make raw file readable
Merge branch 'master' into develop