Merge branch 'master' into develop

docs/conf.py

@@ -60,7 +60,7 @@ author = u'Piotr Maślanka'
 #
 # The short X.Y version.
 from satella import __version__
-version = __version__.split('.', 2)[:2].join('.')
+version = '.'.join(__version__.split('.', 2)[:2])
 # The full version, including alpha/beta/rc tags.
 release = __version__
 

docs/index.rst

@@ -2,7 +2,7 @@ Welcome to satella's documentation!
 ===================================
 
 .. toctree::
-:maxdepth: 2
+       :maxdepth: 2
        :caption: Contents:
 
        coding/monitor

docs/instrumentation/metrics.md

@@ -9,4 +9,4 @@ that does not have to correspond to particular modules or classes. It can be in
 
 By default, it runs in _runtime_ mode. This means that statistics are collected only from metrics of this
 instrument that are set to at least RUNTIME. If a user wants to dig deeper, it can switch the instrument to 
-DEBUG, which will cause more data to be registered.
+DEBUG, which will cause more data to be registered.
\ No newline at end of file