Now with 1% less stupidity!
Merge branch 'master' into meta_rework