Merged master into tags_and_hashes