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

Trivial merge