Updated documentation
Merge branch 'master' into issue_204

Conflicts:
	docs/CHANGES.rst
Merge pull request #263 from collective/issue_204

closes #204