Merge branch '2.0b4'
Merge branch 'master' of https://github.com/oskarlin/icefinder