Changed file extensions on files in tmp
Merge branch 'origin/master'