Merge from qgis:master