Merge branch 'master' into develop
Added -n option to ping
Merge branch 'develop'