Imported Upstream version 1.2.11
Merge branch 'upstream'
Disable some patches for now

Git-Dch: Ignore