Merge pull request #591 from dmaxl/master-upstream Prevent a segfault when writing a config file containing 'rotate' option