See summary.
I've added a patch to do this to my branch on bug 25961.
Fixed in master for 0.17.2.
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.