upgraded versions
Merge commit '4fd11cf93447286d45d76998ce66107c573feaa0' into HEAD