text
Merge branch 'refs/heads/Magnus'
Merge remote-tracking branch 'origin/master' into Magnus