Merge remote-tracking branch 'upstream/v0.10' into v0.11.13-release v0.11.13
authorTimothy J Fontaine <tjfontaine@gmail.com>
Fri, 2 May 2014 00:49:51 +0000 (17:49 -0700)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Fri, 2 May 2014 00:49:51 +0000 (17:49 -0700)

Trivial merge