Imported Upstream version 2.16
Merge tag 'upstream/2.16'

Upstream version 2.16
New upstream version.