[Merge] ~ddstreet/ubuntu-dev-tools/+git/ubuntu-dev-tools:lp1860456 into ubuntu-dev-tools:master

[Colin Watson]

I strongly suggest using https://code.launchpad.net/~cjwatson/ubuntu-dev-tools/+git/ubuntu-dev-tools/+merge/378055 instead, which will work better.
-- 
https://code.launchpad.net/~ddstreet/ubuntu-dev-tools/+git/ubuntu-dev-tools/+merge/377880
Your team Ubuntu Development Team is requested to review the proposed merge of ~ddstreet/ubuntu-dev-tools/+git/ubuntu-dev-tools:lp1860456 into ubuntu-dev-tools:master.