Merge branch 'develop'
Preparing release 1.3.1
Back to development: 1.3.2