Add clarification of logging.file (fixes gh-1416)
Merge branch '1.1.x'