Merge with a fair number of conflicts. Nothing too crazy.

2014-01-20, Mark Doliner