git merge release-9.2
authorChris Hanson <org/chris-hanson/cph>
Thu, 5 Jun 2014 02:54:54 +0000 (19:54 -0700)
committerChris Hanson <org/chris-hanson/cph>
Thu, 5 Jun 2014 02:54:54 +0000 (19:54 -0700)

Trivial merge