Initial commit from hg revision 2d96ee8d9dd4