WIP.
Merge branch 'master' into worknotes-reorg
Bring incomplete worknotes-reorg onto master, incomplete stuff in worknotes is OK.