Fix for HTML docs and results paths containing fixes.
Merge branch 'develop'