Second Fix... GAWD
Merge remote-tracking branch 'origin/sikkerhet'