Imported 1.3.17
Merge branch 'upstream'
Merging 1.3.17