Changes from QGIS review at Vienna Code Sprint

Thanks Anita, Richard and Tim