Imported Upstream version 2.20
Merge branch 'upstream'