[chromaprint-tools/el7: 6/6] Merge commit '9c311c4' into el7