Update to 6.2.0

As the title suggest, this is mostly about updating to the latest upstream release, but I ended up sneaking in a few miscellaneous cleanups as well.