Merge branch 'next' of https://github.com/mksglu/context-mode into next