Merge remote-tracking branch 'upstream/v0.10'
authorTimothy J Fontaine <tjfontaine@gmail.com>
Fri, 14 Feb 2014 19:05:27 +0000 (11:05 -0800)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Fri, 14 Feb 2014 19:05:27 +0000 (11:05 -0800)

Trivial merge