! Reference is missing

Signed-off-by: hhy89 <hhy89@hotmail.com>
Merge pull request #2397 from Oldiesmann/release-2.1

! Trying to delete smiley sets didn't work
Merge pull request #2394 from hhy89/patch-5

! Reference is missing