Document -t.
Add 2.0 history.
Merge remote-tracking branch 'upstream/master'