Merge "Wrap redirectpagesub in a <span>"