Merged `branches/log-mode' to `trunk'