Merge "Fix a crash happening in NBLog's 'writeHistToFile'" into oc-dr1-dev