Merge branch 'dev'
Update README.md
Prepare version 3.1.0
Merge branch 'master' into dev
Merge branch 'master' into dev
Prepare next development version.