Merge branch 'jh/fast-import-notes'