Merge branch '1694-user-agreement'
authorTom Clegg <tom@curoverse.com>
Mon, 30 Dec 2013 23:17:17 +0000 (15:17 -0800)
committerTom Clegg <tom@curoverse.com>
Mon, 30 Dec 2013 23:17:17 +0000 (15:17 -0800)

Trivial merge