Update manifest.git
Merge branch 'coron-4.2' into coron-4.0