Merge "Moved $wgShowUpdatedMarker checks to the right place"