42.9
====
* Misc. bug fixes and cleanups [Jonas, Sebastian; !2318, !2667]

Contributors:
  Jonas Dreßler, Sebastian Keller