fixed runtestserver.py
Merge remote-tracking branch 'origin/develop' into develop