Merge "(bug 36938) XSS in uselang parameter"