Moved backported stuff out of the current version.

Those fixes with were already backported to the 0.10.4 are dropped from
the current changelog entry to avoid confusion.