Merge branch 'unstable'
new logos
Merge branch 'master' into unstable