Merge pull request #571 from joakim-hove/ERT-700-rebaseII

Split faultblocks