fix core.
Merge branch 'master' into diffbot
nothing