Fix vim modeline for these files
Merge branch 'master' into next

* master:
  Fix vim modeline for these files