[Wikitech-l] Evan's patches committed, along with some other stuff