diff --git a/NEWS b/NEWS
index 07892fa..0c1d448 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,19 @@
+Version 7.1.0 (2017-08-24)
+------------------------------------------------------------------------
+
+- New: Mark sections that are not to be automatically linked with the new `<noautolinks>..</noautolinks>` tag.
+- New: Mark sections that are to be automatically linked with the new `<autolinks>..</autolinks>` tag. This tag only makes sense on pages with the `__NOAUTOLINKS__` magic word, or if both `$wgLinkTitlesParseOnEdit` and `$wgLinkTitlesParseOnRender` are set to false. Note that this tag is parsed when a page is rendered, not when it is saved. Therefore, the links will not appear in the page source.
+- Fix: Properly handle templates that include other templates.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+
+
 Version 4.0.9 (2017-03-21)
 ------------------------------------------------------------------------
 
 - Fix: __NOAUTOLINKS__ was not respected during rendering.
 
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 
 Version 4.0.8 (2017-02-16)
@@ -13,7 +23,7 @@ Version 4.0.8 (2017-02-16)
 - Fix: The special page and the maintenance script did not work in MW 1.28.
 - Fix: The special page did not work.
 
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 
 Version 4.0.7 (2017-01-02)
@@ -21,7 +31,7 @@ Version 4.0.7 (2017-01-02)
 
 - Improvement: Increase performance of special page and maintenance script.
 
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 
 Version 4.0.6 (2016-12-28)
@@ -30,7 +40,7 @@ Version 4.0.6 (2016-12-28)
 - Fix: Bug fixes.
 - Fix: Custom namespace weights were not respected.
 
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 
 Version 4.0.5 (2016-12-14)
@@ -40,7 +50,7 @@ Version 4.0.5 (2016-12-14)
 - Fix: Remove leftover error log call.
 - Improvement: Refactored maintenance script, improving user interaction.
 
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 
 Version 4.0.4 (2016-11-30)
@@ -48,7 +58,7 @@ Version 4.0.4 (2016-11-30)
 
 - Fix: Do not link titles twice if $wgLinkTitlesFirstOnly and $wgLinkTitlesSmartMode are both true.
 
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 
 Version 4.0.3 (2016-11-22)
@@ -56,7 +66,7 @@ Version 4.0.3 (2016-11-22)
 
 - Fix: __NOAUTOLINKS__ magic word would not be respected when saving an edited page.
 
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 
 Version 4.0.2 (2016-11-09)
@@ -65,7 +75,7 @@ Version 4.0.2 (2016-11-09)
 - FIX: Removed a fatal bug in the LinkTitles_Maintenance script.
 - FIX: Repaired severely broken namespaces support.
 
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 
 Version 4.0.1 (2016-11-08)
@@ -73,7 +83,7 @@ Version 4.0.1 (2016-11-08)
 
 - FIX: Prevent syntax error when accessing special page.
 
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 
 Version 4.0.0 (2016-11-05)
@@ -85,7 +95,7 @@ Version 4.0.0 (2016-11-05)
 - NEW: Support namespaces.
 - NEW: Use the new extension format introduced by MediaWiki 1.25; the extension will no longer run with older MediaWiki versions.
 
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 
 Version 3.1.0. (2015-02-05)
@@ -93,7 +103,7 @@ Version 3.1.0. (2015-02-05)
 
 - IMPROVEMENT: Do not link inside <file>...</file> tags.
 
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 
 
diff --git a/README.md b/README.md
index 603bd95..bc4847a 100644
--- a/README.md
+++ b/README.md
@@ -16,11 +16,14 @@ This extension is [semantically versioned](http://semver.org).
 Contributing
 ------------
 
-If you wish to contribute, please issue pull requests against the `develop` 
-branch, as I follow Vincent Driessen's advice on [A successful Git branching 
-model](http://nvie.com/git-model) (knowing that there are [alternative 
+If you wish to contribute, please issue pull requests against the `develop`
+branch, as I follow Vincent Driessen's advice on [A successful Git branching
+model](http://nvie.com/git-model) (knowing that there are [alternative
 workflows](http://scottchacon.com/2011/08/31/github-flow.html)).
 
+The `master` branch contains stable releases only, so it is safe to pull the
+master branch if you want to install the extension for your own wiki.
+
 
 Contributors
 ------------
diff --git a/extension.json b/extension.json
index 1991dd0..fe3ee4a 100644
--- a/extension.json
+++ b/extension.json
@@ -7,7 +7,7 @@
         ],
         "type": "parserhook",
         "url": "https://www.mediawiki.org/wiki/Extension:LinkTitles",
-        "version": "4.0.9",
+        "version": "4.1.0",
         "license-name": "GPL-2.0+",
         "descriptionmsg": "linktitles-desc",
         "requires": {
diff --git a/gh-pages b/gh-pages
index 2dec0ce..076be77 160000
--- a/gh-pages
+++ b/gh-pages
@@ -1 +1 @@
-Subproject commit 2dec0ce8a6864c2c1169710fe206175c4c58b940
+Subproject commit 076be774a2dcf5d625adf292c7fd97bddc4bfddd