Merge remote-tracking branch 'waldi/log_apache2'