I didnt want to adopt everything because I dont entirely agree with everything, I only took out two changes that appear valid to me. PR: docs/70217 Submitted by: Leonard Zettel <Zettel at zettel dot us>