Comment 9 for bug 1395098

Rebased, sorry it took me a while to get to this.

I guess this has missed freeze for 15.04 now, but I'd still welcome reviews in case changes are needed before getting it merged next cycle.

Packages for testing are in ppa:rtandy/lp1395098.