Merge branch 'release/3.3' into develop
couple of todo comments
add seven to list of mods
move variable before usage
add more sweetiemotes
remove unused imports
bump version
Merge branch 'release/3.4'