3.36.2
======
* Misc. bug fixes and cleanups [Florian, Xiaoguang; !113, !106]

Contributors:
  Florian Müllner, Xiaoguang Wang

Translators:
  Yosef Or Boczko [he], Kristjan SCHMIDT [eo]