bug 1318: Fix a check for if there were any servers
Merge branch 'bug-1318' into testserver-stable
bug 1318: Actually sort by priority
Merge branch 'bug-1318' into testserver-stable