Merge branch 'master' into development
Added sort by hostname
Merge branch 'development'