[Merge] lp:~bbboson/ubuntu/trusty/unity-control-center/fix-for-1236612 into lp:ubuntu/trusty/unity-control-center

[Sebastien Bacher]

Review: Needs Fixing

Thanks, the merge has quite some conflict, did you target the wrong vcs there?
-- 
https://code.launchpad.net/~bbboson/ubuntu/trusty/unity-control-center/fix-for-1236612/+merge/229749
Your team Ubuntu branches is subscribed to branch lp:ubuntu/trusty/unity-control-center.