Upstream version 20090724