Merge branch 'master' into 5374-hide-collection-checkboxes-anonymous
authorRadhika Chippada <radhika@curoverse.com>
Mon, 9 Mar 2015 18:50:23 +0000 (14:50 -0400)
committerRadhika Chippada <radhika@curoverse.com>
Mon, 9 Mar 2015 18:50:23 +0000 (14:50 -0400)

Trivial merge