Imported Upstream version 2.6.16
Merge tag 'upstream/2.6.16'

Upstream version 2.6.16

* tag 'upstream/2.6.16':
  Imported Upstream version 2.6.16
New upstream release.