Merge branch 'master' into full-closure
authorDan Vanderkam <danvdk@gmail.com>
Mon, 22 Jul 2013 20:37:40 +0000 (16:37 -0400)
committerDan Vanderkam <danvdk@gmail.com>
Mon, 22 Jul 2013 20:37:40 +0000 (16:37 -0400)

Trivial merge