7.1 Partial 2

Even more changes to code base, which will eventually be released as
version 7.1 (December?). See changelog for details.