Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Correct installer and updater class to add cattags column not tootags column
Merge branch 'hotfix-2.0.1' into development