Merged servermode to trunk