Merge "Add $wgServerName"