3.36.1 ====== * Misc. cleanups [Florian; !150, !151] Contributors: Florian Müllner Translators: Daniel Korostil [uk], Daniel Șerbănescu [ro]