Merge branch 'master' into 2871-preload-objects
authorradhika <radhika@curoverse.com>
Wed, 4 Jun 2014 15:29:04 +0000 (11:29 -0400)
committerradhika <radhika@curoverse.com>
Wed, 4 Jun 2014 15:29:04 +0000 (11:29 -0400)

Trivial merge