Work in progress on 1.7.0.
Fixing bug triggered by last patch.
Bumping bundled cache.
Merge branch 'hotfix/1.6.4' into develop