Merge messages and fix makefile process to do this.
11 files changed