Merge refactor-syntax_unicode_sort

Conflicts:
     engine/src/util.cpp