Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop' into release-1.0
Merge branch 'release-1.0'
Add caching to views.
Merge branch 'hotfix/views-caching' into develop