Added make-emacs-shutup-about-font-lock-... method
Resolved merge conflicts