Merge branch 'master' into v2.1

diff --cc src/vm_arm.dasc
Simple merge

diff --cc src/vm_mips.dasc
Simple merge

diff --cc src/vm_ppc.dasc
Simple merge

diff --cc src/vm_x86.dasc
Simple merge