Add bugfix for duplicate palette definition
Merge branch 'origin/dev'