Merge branch 'v0.11.6-release'
authorTimothy J Fontaine <tjfontaine@gmail.com>
Wed, 21 Aug 2013 21:16:29 +0000 (14:16 -0700)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Wed, 21 Aug 2013 21:16:29 +0000 (14:16 -0700)

Trivial merge