Merge pull request #512 from negativeExponent/update_libchdr