11652: Merge branch 'master' into 11652-recursive-contents
authorTom Clegg <tom@curoverse.com>
Tue, 6 Jun 2017 17:53:36 +0000 (13:53 -0400)
committerTom Clegg <tom@curoverse.com>
Tue, 6 Jun 2017 17:53:36 +0000 (13:53 -0400)

Trivial merge