Updating to 3.1.1
Merge branch 'develop'
Merge branch 'heads/master' into develop