Fix KEY_CONTENT_LOCATION issue (crawl cache)
Implements #704
Merge pull request #706 from emmanuel-keller/1.6

1.6