Merge branch 'refs/heads/t/logo-0.6'