Update docs/module.rst
Merge branch 'master' into dev