Merge branch 'stable_py2' into stable

doc/Makefile

@@ -50,6 +50,8 @@ help:
 	@echo "  changes   to make an overview of all changed/added/deprecated items"
 	@echo "  linkcheck to check all external links for integrity"
 	@echo "  doctest   to run all doctests embedded in the documentation (if enabled)"
+	@echo
+	@echo "Append SPHINXOPTS='-A website_deploy=True' to include web analytics code."
 
 clean:
 	-rm -rf $(BUILDDIR)/* $(GENERATEDPDF)

doc/templates/layout.html

@@ -209,5 +209,25 @@
     {%- endif %}
     </div>
 {%- endblock %}
+{%- if website_deploy %}    
+    <!-- Piwik -->
+    <script type="text/javascript">
+      var _paq = _paq || [];
+      _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
+      _paq.push(["setCookieDomain", "*.kwant-project.org"]);
+      _paq.push(["trackPageView"]);
+      _paq.push(["enableLinkTracking"]);
+
+      (function() {
+      var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.kwant-project.org/";
+      _paq.push(["setTrackerUrl", u+"piwik.php"]);
+      _paq.push(["setSiteId", "1"]);
+      var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
+      g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
+      })();
+    </script>
+    <noscript><img src="http://piwik.kwant-project.org/piwik.php?idsite=1&amp;rec=1" style="border:0" alt="" /></noscript>
+    <!-- End Piwik Code: Analytics are used by us to improve the site, and not sent to anyone. -->
+{%- endif %}
   </body>
 </html>