commit from jim at 2013/8/10 12:00 from local machine