Update file to prevent conflicts
Merge branch 'master' into develop