(cherry picked from commit 89b18c05ca) Conflicts: docs/html/overview.html docs/html/sysreq.html support/changelog
89b18c05ca