diff --git a/AUTHORS b/AUTHORS
index da44e980e468..afc71f75e7bf 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -760,6 +760,7 @@ answer newbie questions, and generally made Django that much better:
     Ryan Niemeyer <https://profiles.google.com/ryan.niemeyer/about>
     Ryan Rubin <ryanmrubin@gmail.com>
     Ryno Mathee <rmathee@gmail.com>
+    Sachin Jat <sanch.jat@gmail.com>
     Sam Newman <http://www.magpiebrain.com/>
     Sander Dijkhuis <sander.dijkhuis@gmail.com>
     Sanket Saurav <sanketsaurav@gmail.com>
diff --git a/django/template/base.py b/django/template/base.py
index 9f4fe3363d07..efffa11f8ff5 100644
--- a/django/template/base.py
+++ b/django/template/base.py
@@ -395,7 +395,6 @@ def tokenize(self):
                 token_string = self.template_string[upto:start]
                 result.append(self.create_token(token_string, (upto, start), lineno, in_tag=False))
                 lineno += token_string.count('\n')
-                upto = start
             token_string = self.template_string[start:end]
             result.append(self.create_token(token_string, (start, end), lineno, in_tag=True))
             lineno += token_string.count('\n')