expvar -> stats phase 2
Merge branch 'master' into rest-of-expvar