Merge "resourceloader: Fix undefined $filename in safeFileHash()"