Merge branch 'master' into 5145-combine-collections-repeated-filenames
authorRadhika Chippada <radhika@curoverse.com>
Wed, 11 Mar 2015 18:38:30 +0000 (14:38 -0400)
committerRadhika Chippada <radhika@curoverse.com>
Wed, 11 Mar 2015 18:38:30 +0000 (14:38 -0400)

Trivial merge