Merge branch '11652-recursive-contents'
authorTom Clegg <tom@curoverse.com>
Tue, 6 Jun 2017 19:22:57 +0000 (15:22 -0400)
committerTom Clegg <tom@curoverse.com>
Tue, 6 Jun 2017 19:22:57 +0000 (15:22 -0400)
refs #11652


Trivial merge