ruby-modes sync to upstream 1.8.7