_s: Removes unnecessary switch in and out of PHP.
Merge branch 'master' of https://github.com/Automattic/_s.git
Merge pull request #1 from Automattic/master

update from upstream