Add documentation for terminal matchers.
Merge branches 'terminal' and 'master'