Merge branch '1.0' into 1.0-csp-fix

Author: jonashaag

docs/web3-utils.rst

@@ -978,7 +978,7 @@ Parameters
 ----------
 
 1. ``number`` - ``String|Number|BN``: The value.
-1. ``unit`` - ``String`` (optional, defaults to ``"ether"``): The ether to convert from. Possible units are:
+2. ``unit`` - ``String`` (optional, defaults to ``"ether"``): The ether to convert from. Possible units are:
     - ``noether``: '0'
     - ``wei``: '1'
     - ``kwei``: '1000'