java.lang.ClassCastException on exit from irb

In IRB or the Rails console, hitting CNTL-D to exit does exit, but throws an exception in the process.

Introduced by the update to jline2: https://github.com/jruby/jruby/commit/a00e2780893646b88dad049f2bb44f09a2119d2c

$ irb
jruby-1.7.0.dev :001 > []
=> []
jruby-1.7.0.dev :002 > ^D
Readline.java:382:in `s_hist_to_a': java.lang.ClassCastException: jline.console.history.MemoryHistory$EntryImpl cannot be cast to java.lang.String
from Readline$HistoryMethods$INVOKER$s$0$0$s_hist_to_a.gen:-1:in `call'
from CachingCallSite.java:292:in `cacheAndCall'
from CachingCallSite.java:135:in `call'
from CallNoArgNode.java:63:in `interpret'
from CallNoArgNode.java:63:in `interpret'
from CallNoArgNode.java:63:in `interpret'
from CallNoArgNode.java:63:in `interpret'
from LocalAsgnNode.java:123:in `interpret'
from NewlineNode.java:104:in `interpret'
from BlockNode.java:71:in `interpret'
from ASTInterpreter.java:112:in `INTERPRET_BLOCK'
from Interpreted19Block.java:209:in `evalBlockBody'
from Interpreted19Block.java:197:in `yield'
from Interpreted19Block.java:128:in `call'
from Block.java:89:in `call'
from RubyProc.java:269:in `call'
from RubyProc.java:223:in `call'
from Ruby.java:2899:in `tearDown'
from Ruby.java:2886:in `tearDown'
from Main.java:267:in `internalRun'
from Main.java:230:in `run'
from Main.java:214:in `run'
from Main.java:194:in `main'