Holy molly I think it works. NAT punching time?
Merge remote-tracking branch 'origin/master'