Merge branch 'master' into new_disk_cache_api