Merge branch 'master' into 3821-collection-file-manage
authorradhika <radhika@curoverse.com>
Tue, 28 Mar 2017 19:26:39 +0000 (15:26 -0400)
committerradhika <radhika@curoverse.com>
Tue, 28 Mar 2017 19:26:39 +0000 (15:26 -0400)

Trivial merge