Merge branch 'hotfix/2.0.4'
Prevent possible recursion in the group shipping method
Typos
Fixed missing return value in load_callback in DC_ProductData driver
Fixed missing palette for messages module
CS
Merged latest 2.0.5 hotfix branch before 2.1 release
Release 2.1.0-rc1