Merge branch 'master' into labelling

diff --cc leo.c
Simple merge

diff --cc sym-text.c
Simple merge

diff --cc sym.h
Simple merge