Testserver

Merging bug-1140 into testserver