Merge branch 'betterIconsForGisTheme' into allWork
Merge branch 'bugfix_6856' into allWork
Merge branch 'frenchTranslationUpdates' into allWork