Emojicon

Merge master into Emojicon.