Imported Upstream version 3.1.11
Merge tag 'upstream/3.1.11'

Upstream version 3.1.11
New upstream release.