Merge remote-tracking branch 'upstream/v0.10'
authorTimothy J Fontaine <tjfontaine@gmail.com>
Wed, 1 Jan 2014 00:28:49 +0000 (16:28 -0800)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Wed, 1 Jan 2014 00:28:49 +0000 (16:28 -0800)

Trivial merge