Merging latest changes from CocoaLumberjack