Merge branch 'master' into http_file_raw