Merge branch 'master' into 9426-collection-tags
authorradhika <radhika@curoverse.com>
Tue, 20 Jun 2017 21:25:25 +0000 (17:25 -0400)
committerradhika <radhika@curoverse.com>
Tue, 20 Jun 2017 21:25:25 +0000 (17:25 -0400)

Trivial merge