Imported Upstream version 1.5.3
Merge branch 'upstream'