Merge branch 'jc/prettier-pretty-note'