Merge branch 'master' into next

diff --cc lib/sup/mbox.rb
index 0abedc099c671d27822e9235842844a94a489ba3,2494897f1166f1411ea6bae1323c85968a13f177..f267b3b03aebbe846e7b3b08148cf7c72797a8a8
--- 1/lib/sup/mbox.rb
--- 2/lib/sup/mbox.rb
+++ b/lib/sup/mbox.rb
@@@ -37,12 -37,12 +37,12 @@@ module MBo
  
        ## these next three can occur multiple times, and we want the
        ## first one
 -      when /^(Delivered-To):\s+(.*)$/i,
 -        /^(X-Original-To):\s+(.*)$/i,
 -        /^(Envelope-To):\s+(.*)$/i: header[last = $1] ||= $2
 +      when /^(Delivered-To):\s*(.*)$/i,
 +        /^(X-Original-To):\s*(.*)$/i,
 +        /^(Envelope-To):\s*(.*)$/i: header[last = $1] ||= $2
  
-       when /^$/: break
-       when /^\S+: /: last = nil # some other header we don't care about
+       when /^\r*$/: break
+       when /^\S+:/: last = nil # some other header we don't care about
        else
          header[last] += " " + line.chomp.gsub(/^\s+/, "") if last
        end