Merge branch 'release/0.6.0'
Merge branch 'release/0.6.3'
Merge branch 'release/0.6.4'
Merge branch 'release/0.6.4'
changed to new nat-pmp repo
Merge branch 'master' into develop