Merge branch 'master' of https://github.com/TanninOne/modorganizer-plugin_python # Conflicts: # src/runner/uibasewrappers.h