Merge branch 'master' into 5375-preview-collection-text-files
authorRadhika Chippada <radhika@curoverse.com>
Wed, 18 Mar 2015 13:45:21 +0000 (09:45 -0400)
committerRadhika Chippada <radhika@curoverse.com>
Wed, 18 Mar 2015 13:45:21 +0000 (09:45 -0400)

Trivial merge