- fix server name on reservations
Merge origin/master