Using v3.1.0 rather than v3.1 for consistency.
Merge branch 'develop'