3.33.2
======
* Misc. bug fixes and cleanups [Florian; !66]

Contributors:
  Florian Müllner