Merge branch 'master' into development
ignore ip spoof errors
Merge branch 'development'