Conflicts: acinclude.m4 data/y-web/Y_Blocks.txt src/driver/nglcd.cpp src/gui/vfd_setup.cpp src/neutrino.cpp