Update theme .pot
Merge branch 'master' of git://github.com/Automattic/_s into upstream
Merge branch 'upstream'
Merge branch 'master' into customized