Merge branch 'feature/opm-2016.10' into 'master'

Bernd Flemischrequested to merge
cherry-pick-22ef06f4 into next

[opm] Update to opm 2016.10 version

See merge request !262 (merged)

Merge request reports