Fix minimap
Allow use std::endl when including log.h
Merge remote-tracking branch 'upstream/master' into next