Delete empty file
Merge branch 'master' into mac