Merge proposal at https://code.launchpad.net/~smoser/software-properties/trunk.lp1532855/+merge/318132
Merge proposal at https:/ /code.launchpad .net/~smoser/ software- properties/ trunk.lp1532855 /+merge/ 318132