Merge branch 'lazy-floenv'
authorTaylor R Campbell <campbell@mumble.net>
Thu, 20 Jun 2013 15:46:19 +0000 (15:46 +0000)
committerTaylor R Campbell <campbell@mumble.net>
Thu, 20 Jun 2013 15:46:19 +0000 (15:46 +0000)

Trivial merge