Merge pull request #426 from negativeExponent/update_libchdr