Merged personal/mode-*.el from branch master.