followup ui rename (followup 13eb726d)
Merge remote-tracking branch 'qgis/master' into wms_legend