Merge commit 'upstream/0.0_git20110724.48593f5'