fix typo
Merge branch 'master' into banner-tile