Fixes gh-1997 Close gh-1998 Conflicts: test/unit/core.js
Attach a file by drag & drop or click to upload
