beta-0.40.1
3b588a02 · Merging r2381 through r2383 from trunk ·