Merge branch 'master' into develop
Updated packages
Updated to the new, simplified plugin architecture
Release 2.2.5