Merge remote-tracking branch 'opm/master'
Merge branch 'master' of github.com:qilicun/opm-core