Deleted some things that are already present in 14.1
Merge branch 'master' into microemulator