Various upstream upgrades and bugfixes, plus minor bugfixes to cm-suggest package