Merge branch 'v0.11.10-release'
authorTimothy J Fontaine <tjfontaine@gmail.com>
Wed, 1 Jan 2014 00:20:58 +0000 (16:20 -0800)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Wed, 1 Jan 2014 00:20:58 +0000 (16:20 -0800)

Trivial merge