Merge branch 'master' into tun
Merge branch 'tun' of github.com:freelan-developers/libfreelan into tun