Removing the 'original' file
Merge branch 'master' into develop