Merge branch 'master' into 5197-collection-name-owner-unique
authorRadhika Chippada <radhika@curoverse.com>
Mon, 16 Feb 2015 20:31:55 +0000 (15:31 -0500)
committerRadhika Chippada <radhika@curoverse.com>
Mon, 16 Feb 2015 20:31:55 +0000 (15:31 -0500)

Trivial merge