diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index bfafdbb..7cac3d0 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -1631,6 +1631,22 @@
   filetype off
 endfunc
 
+func Test_grc_file()
+  filetype on
+
+  call writefile(['<?xml version="1.0"?>', '<block>', '</block>'], 'Xfile.grc')
+  split Xfile.grc
+  call assert_equal('xml', &filetype)
+  bwipe!
+
+  call writefile(['metadata:', '  file_format: 1'], 'Xfile.grc')
+  split Xfile.grc
+  call assert_equal('yaml', &filetype)
+  bwipe!
+
+  filetype off
+endfunc
+
 func Test_haredoc_file()
   filetype on
   call assert_true(mkdir('foo/bar', 'pR'))
diff --git a/src/version.c b/src/version.c
index d64a1e6..c0c98b4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1360,
+/**/
     1359,
 /**/
     1358,