[chromaprint-tools/el7] (6 commits) ...Merge commit '9c311c4' into el7