merge 1.8 into yahooxpc