Revert "Revert "Merge pull request #121 from joakim-hove/MSW-130""

This reverts commit e5532f6735857c6313d92e4cc2f290d9bdec4739.
Revert "Revert "Merge pull request #122 from joakim-hove/MSW-130""

This reverts commit 186ac25286870f3fbf2ea801275c071bd9486401.
Merge remote-tracking branch 'upstream/master' into reapply-MSW

Conflicts:
	devel/libecl/include/ert/ecl/ecl_grid.h
Merge pull request #127 from joakim-hove/reapply-MSW

Reapply MSW to upstream/master