Follow changes in opm-core.
Merge pull request #37 from atgeirr/combined

Adapt to changes in OPM/opm-core#203