Merge branch 'unstable'
pull logo from master instead of unstable branch
Merge branch 'master' into unstable