Upstream git checkout 20080721