Merge several fixes from upsteam ruby-mode.