More linting.
Merge branch 'development' into linuxdynasty_patching_plugin_decouple