Merge more upstream and bring some older changes more in line with upstream, so diffs read easier
Clean up a now unneeded folder and fix typo