Merge proposals

cl-trivial-backtrace in Ubuntu has no merge proposals.