Merge from trunk rev.14346

diff --cc src/Makefile.am
Simple merge

diff --cc src/cf.data.pre
Simple merge

diff --cc src/format/ByteCode.h
Simple merge

diff --cc src/format/Format.cc
Simple merge

diff --cc src/format/Token.cc
Simple merge