Consolidate QGIS2 changes, update metadata