Proposed for merging:
https://code.launchpad.net/~swem/ubiquity/+git/ubiquity/+merge/346665 https://code.launchpad.net/~swem/ubiquity/+git/ubiquity/+merge/346666
Proposed for merging:
https:/ /code.launchpad .net/~swem/ ubiquity/ +git/ubiquity/ +merge/ 346665 /code.launchpad .net/~swem/ ubiquity/ +git/ubiquity/ +merge/ 346666
https:/