Merge branch '3235-all-contents' refs #3235
authorTom Clegg <tom@curoverse.com>
Mon, 28 Jul 2014 21:10:16 +0000 (17:10 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 28 Jul 2014 21:10:16 +0000 (17:10 -0400)

Trivial merge