Merge branch 'master' into 5375-preview-collection-text-files
authorRadhika Chippada <radhika@curoverse.com>
Fri, 20 Mar 2015 15:30:59 +0000 (11:30 -0400)
committerRadhika Chippada <radhika@curoverse.com>
Fri, 20 Mar 2015 15:30:59 +0000 (11:30 -0400)

Trivial merge