[Wikitech-l] Merging the ContentHandler into master