Previous merge not as intended and broke the code. This is fixed here.
Previous merge not as intended and broke the code. This is fixed here.

sintefmath/equelle,atgeirr/equelle,babrodtk/equelle,babrodtk/equelle,sintefmath/equelle,sintefmath/equelle,sintefmath/equelle,sintefmath/equelle,babrodtk/equelle,atgeirr/equelle,sintefmath/equelle,babrodtk/equelle,babrodtk/equelle,atgeirr/equelle,babrodtk/equelle,atgeirr/equelle,babrodtk/equelle,atgeirr/equelle,atgeirr/equelle,atgeirr/equelle,sintefmath/equelle,atgeirr/equelle,sintefmath/equelle