diff --git a/.gitignore b/.gitignore
index ac79cd9d4..c46f9328b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *.pyc
 .*
+*.mo
 
 # sphinx build directories
 _build/
diff --git a/_extensions/html_domain.py b/_extensions/html_domain.py
index 2ee896486..a5b81491f 100644
--- a/_extensions/html_domain.py
+++ b/_extensions/html_domain.py
@@ -21,10 +21,12 @@ def setup(app):
     app.add_node(div, html=(
         lambda self, node: self.body.append(self.starttag(node, 'div')),
         lambda self, node: self.body.append('</div>\n')))
+    # override parameter was added for version sphinx >= 1.4, TypeError before
+    kw = {'override': True} if sphinx.version_info >= (1, 4) else {}
     app.add_node(address, html=(
         lambda self, node: self.body.append(self.starttag(node, 'address')),
         lambda self, node: self.body.append('</address>\n')
-    ))
+    ), **kw) # docutils.nodes.address exists and is a bibliographic element
     app.add_node(cite, html=(visit_cite, depart_cite))
     for name, node in [('mark', mark), ('ins', insert), ('del', delete),
                        ('s', strikethrough), ('u', underline), ('small', small),
diff --git a/accounting/localizations/mexico.rst b/accounting/localizations/mexico.rst
index bf6acab35..875cf2f0e 100644
--- a/accounting/localizations/mexico.rst
+++ b/accounting/localizations/mexico.rst
@@ -29,7 +29,7 @@ accounting and invoicing system due to all the set of normal requirements for
 this market, becoming your Odoo in the perfect solution to administer your
 company in Mexico.
 
-Configuration 
+Configuration
 ~~~~~~~~~~~~~
 
 .. tip::
@@ -62,6 +62,8 @@ integrate with the normal invoicing flow in Odoo.
 .. image:: media/mexico02.png
    :align: center
 
+.. _mx-legal-info:
+
 3. Set you legal information in the company
 -------------------------------------------
 
@@ -585,8 +587,8 @@ FAQ
    **Solution:** You must set the address on your company properly, this is a
    mandatory group of fields, you can go to your company configuration on
    :menuselection:`Settings --> Users & Companies --> Companies` and fill
-   all the required fields for your address following the step `3. Set you
-   legal information in the company`.
+   all the required fields for your address following the step
+   :ref:`mx-legal-info`.
 
 - **Error message**: