Merge "Clarifying double-redirect messages"