Potential fix for Issue #709
Merge pull request #995 from cherokee/fix_hotlinking

Potential fix for Issue #709