Merge "fix incorrect index range in emoji-helper" into devel/master