Merge branch 'master' into 3177-collection-choose-files
authorradhika <radhika@curoverse.com>
Mon, 10 Nov 2014 16:32:31 +0000 (11:32 -0500)
committerradhika <radhika@curoverse.com>
Mon, 10 Nov 2014 16:32:31 +0000 (11:32 -0500)

Trivial merge