merge latest version from trunk, for correct location of logs