Pull request to merge mod2 with master.

From the second half of Tealeaf Week 2.