45.7
====
* Misc. bug fixes and cleanups [Jonas, Florian; !3757, !3775]

Contributors:
  Jonas Ådahl, Florian Müllner