Comment # 25 on bug 1201089 from Martin Li������ka

I cherry-picked many upstream fixes for packages that still lack a new (fixed)
release..