Merge "Consistently preserve anchors in the title specified in 'mainpage' message"