Fixed PEACE OMNI
Merge branch 'master' into devel