Updated for NetworkManager 0.9.10