Merge branch 'v0.11.11-release'
authorTimothy J Fontaine <tjfontaine@gmail.com>
Wed, 29 Jan 2014 03:46:04 +0000 (19:46 -0800)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Wed, 29 Jan 2014 03:46:04 +0000 (19:46 -0800)

Trivial merge