Merge branch 'master' into 2871-preload-objects
authorradhika <radhika@curoverse.com>
Thu, 5 Jun 2014 12:52:01 +0000 (08:52 -0400)
committerradhika <radhika@curoverse.com>
Thu, 5 Jun 2014 12:52:01 +0000 (08:52 -0400)

Trivial merge