Merge branch 'master' into 4644-collection-file-filtering
authorradhika <radhika@curoverse.com>
Mon, 1 Dec 2014 22:10:09 +0000 (17:10 -0500)
committerradhika <radhika@curoverse.com>
Mon, 1 Dec 2014 22:10:09 +0000 (17:10 -0500)

Trivial merge