Merged eb/binstats -r3848:3906 into trunk. These changes