Merge branch 'master' into 7200-keepproxy-index-api
authorradhika <radhika@curoverse.com>
Tue, 29 Sep 2015 21:44:26 +0000 (17:44 -0400)
committerradhika <radhika@curoverse.com>
Tue, 29 Sep 2015 21:44:26 +0000 (17:44 -0400)

Trivial merge