44885 -0400 committer Jeff Garzik 1150244885 -0400 Merge branch 'master' into upstream ®ÇVV‘