Improve soft indent of wrapped lines to take into account > quotes.
Update CM to 4.6+