Marcus Harnisch <marcus.harnisch@gmx.net>

* Merged changes from upstream version 0.4.8

* ChangeLog:
* ChangeLog-upstream: Split ChangeLog to track upstream changes
separately.