lp bug: https://launchpad.net/bugs/1027893 fixed bzr revid: stefan@therp.nl-20120723112257-vthd72q07o9pf2bn