Following timss/vimconf upstream