data update (minor)
Merge remote-tracking branch 'eserte/master' into world