Merge branch 'master' of mathias-kettner.de:omd