Pre-merge
Removing stupid crap
Trying to merge
Merge branch 'master' into brian