Merge branch 'master' into 11823-collection-lifecycle-doc
authorradhika <radhika@curoverse.com>
Wed, 21 Jun 2017 14:15:19 +0000 (10:15 -0400)
committerradhika <radhika@curoverse.com>
Wed, 21 Jun 2017 14:15:19 +0000 (10:15 -0400)

Trivial merge