Merge branch 'release-3.1.7' into develop
"Continue with install anyway" made more consistent
Removed index.html files
Bumped version/changelog
Merge branch 'release-3.1.8'