Merge branch 'master' into comment-cache

diff --cc lisp/progmodes/cc-engine.el
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/insdel.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/syntax.c
Simple merge

diff --cc src/textprop.c
Simple merge