Martin Happ Merge branch 'master' of http://github.com/happma/WMWssp