Merged from master into relocate for changes to text files