sync hostfile more often
Merge remote-tracking branch 'upstream/master'