Upgrading play to 2.3.7
Merge branch 'develop' into feature/password-expire