Merge pull request #9520 from danielkucera/minisatip