Forwarding patch from https://launchpad.net/bugs/1406133: