Fix for Emoji (to stable)

Valery Sizov requested to merge notes_fix_to_stable into 8-2-stable Nov 20, 2015