Imported Upstream version 2.2.11
Merge tag 'upstream/2.2.11'

Upstream version 2.2.11
Release 2.2.11-1 with new upstream version

Git-Dch: Ignore