Merge conflicts with spec master

[sbc100]

There are merge conflicts between this repo and the spec master branch:

Removing test/core/typecheck.wast
Auto-merging test/core/memory.wast
Auto-merging interpreter/text/parser.mly
Auto-merging interpreter/text/lexer.mll
Auto-merging interpreter/text/arrange.ml
CONFLICT (content): Merge conflict in interpreter/text/arrange.ml
Auto-merging interpreter/script/script.ml
Auto-merging interpreter/script/run.ml
CONFLICT (content): Merge conflict in interpreter/script/run.ml
Auto-merging interpreter/script/js.ml
Auto-merging interpreter/exec/eval.ml
Auto-merging interpreter/README.md
Auto-merging document/web-api/index.bs
Auto-merging document/js-api/index.bs
CONFLICT (content): Merge conflict in document/js-api/index.bs
Auto-merging document/core/valid/types.rst
Auto-merging document/core/util/macros.def
Auto-merging document/core/text/instructions.rst
Auto-merging document/core/syntax/instructions.rst
Auto-merging document/core/exec/runtime.rst
CONFLICT (content): Merge conflict in document/core/exec/runtime.rst
Auto-merging document/core/exec/numerics.rst
Auto-merging document/core/exec/modules.rst
Auto-merging document/core/exec/instructions.rst
Auto-merging document/core/appendix/properties.rst
Auto-merging document/core/appendix/index-rules.rst
Auto-merging document/core/appendix/index-instructions.rst
CONFLICT (content): Merge conflict in document/core/appendix/index-instructions.rst

This prevents the testsuite mirror's update script from updating the reference-types tests.