Imported Upstream version 2.10.1
Merge tag 'upstream/2.10.1'

Upstream version 2.10.1

* tag 'upstream/2.10.1':
  Imported Upstream version 2.10.1
New upstream release.
releasing version 2.10.1-1