Correctly merge server variables fix to master