Final commit with log.
Fix for HOST