- Fixed: shortnames on reservations would change to first server name after refresh
Merge origin/master