Merge from http://code.google.com/p/phc