Merge pull request #420 from annando/unicode-emoji