Fix error in text formatter when note is nil
Merge branch 'master' into project-directory