Merge branch 'master' into unicode

diff --cc extra/delegate/protocols/protocols.factor
index e6f794de5371049c262d59bc0c748f3366b42787,37f3812d2d4751c26642c850cc848929bb4d4bd0..f9b4c8648dce75538a85ee806846b7c09f9e7bee
--- 1/extra/delegate/protocols/protocols.factor
--- 2/extra/delegate/protocols/protocols.factor
+++ b/extra/delegate/protocols/protocols.factor
@@@ -15,10 -15,10 +15,10 @@@ PROTOCOL: assoc-protoco
      ! everything should work, just slower (with >alist)
  
  PROTOCOL: stream-protocol
 -    stream-read1 stream-read stream-read-until
 +    stream-read1 stream-read stream-read-until dispose
      stream-flush stream-write1 stream-write stream-format
      stream-nl make-span-stream make-block-stream stream-readln
-     make-cell-stream stream-write-table set-timeout ;
+     make-cell-stream stream-write-table ;
  
  PROTOCOL: definition-protocol
      where set-where forget uses redefined*