Merge "NBLog exchange author and timestamp positions in log"