Merge pull request #1305 from pw374/master

omd 0.7.0
omd 0.7.1