Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin' into 1.8.7
Conflicts: gems_list.txt vm/builtin/encoding.cpp vm/builtin/object.cpp vm/capi/string.cpp vm/marshal.cpp