Merge branch 'v0.11.12-release'
authorTimothy J Fontaine <tjfontaine@gmail.com>
Wed, 12 Mar 2014 14:56:30 +0000 (07:56 -0700)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Wed, 12 Mar 2014 14:56:30 +0000 (07:56 -0700)

Trivial merge