om-mode
Merge pull request #2006 from danielsz/om-mode

om-mode