See attached branch.
This looks OK to me, for 0.8 and 0.9.
Ping? Ship it?
Merged to both 0.8 and master.
Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.