import upstream version 1.9.15
Merge branch 'upstream' into bp/precise
backport 1.9.15 to ubuntu precise