Merge branch 'master' into 6203-collection-perf-api
authorradhika <radhika@curoverse.com>
Wed, 3 Jun 2015 19:11:20 +0000 (15:11 -0400)
committerradhika <radhika@curoverse.com>
Wed, 3 Jun 2015 19:11:20 +0000 (15:11 -0400)

Trivial merge