Merge branch 'jh/notes'