Merge branch 'libmagic' into 'develop'