Merge branch 'master' into txxx_bugs
ticket: xxx fix NPE bug in NetworkManager
Merge branch 'master' of github.com:42cc/p2psafety