Link in diary.
Merge branch `diary` into `master`.