Merge last change from upstream

And git lost the upstream history ...