[Merge] ~3v1n0/ubuntu/+source/ubuntu-settings:master into ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master

[Sebastien Bacher]

Review: Approve

thanks
-- 
https://code.launchpad.net/~3v1n0/ubuntu/+source/ubuntu-settings/+git/ubuntu-settings/+merge/353442
Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master.