Pulled v1.8 from code.google