updating from ruby-mode checkout 40375 to 40823