Merge branch 'master' into bittelc
Delete lots of stuff

Delete stuff
Merge branch 'bittelc'