Fix LevelDB maps
Merge 'upstream/master' into minemovie