import upstream tarball 9.3.2
Merge branch 'upstream' into bp/precise
backport 9.3.2 to ubuntu precise