Things merged from Lee's fork.
Things merged from Lee's fork.