Merge branch 'master' into nick.lloyd-bytecode-jit

diff --cc src/alloc.c
Simple merge

diff --cc src/bytecode.c
Simple merge

diff --cc src/data.c
Simple merge

diff --cc src/eval.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/lread.c
Simple merge