DO NOT EVER MERGE TO ANYWHERE ELSE
Custom mods for Mercurial and stuff