Merge branch 'master' into 2871-preload-objects
authorradhika <radhika@curoverse.com>
Sat, 7 Jun 2014 13:03:19 +0000 (09:03 -0400)
committerradhika <radhika@curoverse.com>
Sat, 7 Jun 2014 13:03:19 +0000 (09:03 -0400)

Trivial merge