Toggling on/off now updates the server xml
Merge remote-tracking branch 'origin/master'