OPM/opm-parser — pull request #338 by joakim-hove (2014-11-05 12:44:30+00:00)
Title: Pr 333 cherry pick

Selected cherry-picks from: #333