Imported Upstream version 7.40.6
Merge tag 'upstream/7.40.6'

Upstream version 7.40.6
New upstream version (7.40)

Includes soname bump (37 to 38) and removal of code to delete "header"
since that was renamed upstream.