Imported Upstream version 2.2.1017
Merge tag 'upstream/2.2.1017'

Upstream version 2.2.1017

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