Merge branch 'master' into nhmall-booktribute

diff --cc doc/fixes35.0
Simple merge

diff --cc include/extern.h
Simple merge

diff --cc src/allmain.c
Simple merge

diff --cc src/files.c
Simple merge

diff --cc src/read.c
Simple merge