import upstream tarball version 1.10.1
Merge branch 'upstream' into bp/precise
backport 1.10.1 to precise