Merge pull request #2249 from commodo/squashfs-tools