Merge commit 'c8fe69c' which adds Cromigons artist display