Merge tag '2.3.0' into develop

2.3.0
Update W3C Total Cache import settings file
Merge branch 'hotfix/2.3.1'