Imported Upstream version 3.1.15
Merge tag 'upstream/3.1.15'

Upstream version 3.1.15
New upstream release.