Merge from qgis:master

Leave a comment