Manual merge with HEAD.
Merge branch 'lunaryorn-inherit-major-mode'