qgis-22: rev 1; patch of all backports to release-2_2 branch