Merge branch 'v0.11.5-release'
authorTimothy J Fontaine <tjfontaine@gmail.com>
Wed, 7 Aug 2013 00:13:17 +0000 (17:13 -0700)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Wed, 7 Aug 2013 00:13:17 +0000 (17:13 -0700)

Trivial merge