Merge branch 'v0.11.4-release'
authorTimothy J Fontaine <tjfontaine@gmail.com>
Fri, 12 Jul 2013 22:16:33 +0000 (15:16 -0700)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Fri, 12 Jul 2013 22:16:33 +0000 (15:16 -0700)

Trivial merge