Merge "Allow saving log files in different directory" into gingerbread