Merge "Folowup I341c3f7c: Fire wikipage.content with the correct content"