Merge branch 'master' into support_neighbors

templates/article.html

@@ -67,6 +67,8 @@
     {% endfor %}
     </ul>
   </div>
+  {% else %}
+    <div class="addthis_relatedposts_inline">
   {% endif %}
 
   {% if GOOGLE_ADSENSE and GOOGLE_ADSENSE.ads.article_bottom %}

templates/base.html

@@ -40,7 +40,11 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
   <meta name="HandheldFriendly" content="True" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <meta name="robots" content="{{ ROBOTS }}" />
+  {% if page in hidden_pages %}
+    <meta name="robots" content="noindex, nofollow" />
+  {% else %}
+    <meta name="robots" content="{{ ROBOTS }}" />
+  {% endif %}
 
   {% if BROWSER_COLOR %}
     <!-- Chrome, Firefox OS and Opera -->
@@ -182,9 +186,9 @@
   {% include "partial/jsonld.html" %}
 
   {% block additional_js %}{% endblock %}
-  
+
   {% if GITHUB_CORNER_URL %}
-  {% include 'partial/github.html' %}  
+  {% include 'partial/github.html' %}
   {% endif %}
 </body>
 </html>