Fix tests for solaris 11
Merge branch 'master' of github.com:atilamx/wintermute