diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index c5b01f0c40..d60ab65ce7 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -868,7 +868,7 @@ func! s:FThtml()
       setf xhtml
       return
     endif
-    if getline(n) =~ '{%\s*\(extends\|block\|load\)\>'
+    if getline(n) =~ '{%\s*\(extends\|block\|load\)\>\|{#\s\+'
       setf htmldjango
       return
     endif
diff --git a/src/nvim/version.c b/src/nvim/version.c
index f43755b48d..de936c989a 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -429,7 +429,7 @@ static int included_patches[] = {
   // 862 NA
   // 861 NA
   // 860 NA
-  // 859,
+  859,
   858,
   // 857,
   856,