Hand-merge some of CM's recent changes.

Signed-off-by: Randy DuCharme <radio.ad5gb@gmail.com>