diff --git a/docs/docsite/_themes/srtd/layout.html b/docs/docsite/_themes/srtd/layout.html
index 0a43025808f..facd931de0b 100644
--- a/docs/docsite/_themes/srtd/layout.html
+++ b/docs/docsite/_themes/srtd/layout.html
@@ -33,6 +33,7 @@
   {% if favicon %}
     <link rel="shortcut icon" href="{{ pathto('_static/' + favicon, 1) }}"/>
   {% endif %}
+  <link rel="canonical" href="https://docs.ansible.com/ansible/latest/{{ pagename }}.html"/>
 
   {# CSS #}
   <link href='https://fonts.googleapis.com/css?family=Lato:400,700|Roboto+Slab:400,700|Inconsolata:400,700' rel='stylesheet' type='text/css'>
diff --git a/docs/templates/plugin.rst.j2 b/docs/templates/plugin.rst.j2
index 2ed09442c72..c5301fbfd57 100644
--- a/docs/templates/plugin.rst.j2
+++ b/docs/templates/plugin.rst.j2
@@ -194,7 +194,7 @@ Common return values are documented here :doc:`common_return_values`, the follow
     <th class="head">type</th>
     <th class="head">sample</th>
     </tr>
-{% for entry in returndocs|dictsort %}
+{% for entry, unusedvalue in returndocs|dictsort %}
 
     <tr>
     <td>@{ entry }@</td>