closes #4228
authorradhika <radhika@curoverse.com>
Thu, 23 Oct 2014 21:23:00 +0000 (17:23 -0400)
committerradhika <radhika@curoverse.com>
Thu, 23 Oct 2014 21:23:00 +0000 (17:23 -0400)
Merge branch '4228-collection-subdir-files'


Trivial merge