- merge changes from HEAD (primarily vserver.py bugfix)