Merge pull request #5029 from jmarshallnz/protocol_filetype