6.x-1.0-beta6
bcee2f89 · #654704 by mrfelton: More accurate backport, various fixes ·