Merge branch 'develop' with the Middleware updates.
authorDavid Schoonover <dsc@wikimedia.org>
Thu, 5 Jul 2012 21:28:11 +0000 (14:28 -0700)
committerDavid Schoonover <dsc@wikimedia.org>
Thu, 5 Jul 2012 21:28:11 +0000 (14:28 -0700)

Trivial merge