Merge 'master' to 'tabbar-icon-style'