Merge "Special:Search: Remove token from URL when saving settings"