Update from WordPress.com.
Merge branch 'master' of https://github.com/avryl/new-smileys