Merge branch 'master' into 2871-preload-objects
authorradhika <radhika@curoverse.com>
Tue, 10 Jun 2014 12:58:22 +0000 (08:58 -0400)
committerradhika <radhika@curoverse.com>
Tue, 10 Jun 2014 12:58:22 +0000 (08:58 -0400)

Trivial merge