Merge branch 'master' into develop
Attempt to fix problem with RST text rendering on PyPI.
Merge branch 'release-1.1.1'