various changes for 5.1.0 before new release, from doc/doc@418731c644