This has already been ACK'ed, so I'm just applying it to trusty immediately. The "cherry picked" line references a vivid SHA (this isn't an upstream commit) so isn't relevant; dropping it. -Kamal