Merge branch 'v0.11.13-release'
authorTimothy J Fontaine <tjfontaine@gmail.com>
Fri, 2 May 2014 14:53:32 +0000 (07:53 -0700)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Fri, 2 May 2014 14:53:32 +0000 (07:53 -0700)

Trivial merge