Revert "Merge branch 'beta' into 'master'"

Guldberg, Erikrequested to merge
revert-d722fa38 into master

This reverts merge request !17 (merged)

Merge request reports