Merge branch 'master' into 3177-collection-choose-files
authorradhika <radhika@curoverse.com>
Wed, 12 Nov 2014 14:02:44 +0000 (09:02 -0500)
committerradhika <radhika@curoverse.com>
Wed, 12 Nov 2014 14:02:44 +0000 (09:02 -0500)

Trivial merge