Imported Upstream version 4.8.13
Merge tag 'upstream/4.8.13'

Upstream version 4.8.13