[Merge] lp:~waveform/meta-release/ubuntu into lp:~ubuntu-core-dev/meta-release/ubuntu

[Dave Jones]

Dammit, yes ... trying to hack during a meeting ...

-- 
https://code.launchpad.net/~waveform/meta-release/ubuntu/+merge/420034
Your team Ubuntu Core Development Team is requested to review the proposed merge of lp:~waveform/meta-release/ubuntu into lp:~ubuntu-core-dev/meta-release/ubuntu.