Merge branch 'master' into 2871-preload-objects
authorradhika <radhika@curoverse.com>
Mon, 9 Jun 2014 20:40:39 +0000 (16:40 -0400)
committerradhika <radhika@curoverse.com>
Mon, 9 Jun 2014 20:40:39 +0000 (16:40 -0400)

Trivial merge