Merge branch 'master' of scm.uninett.no:iou/microdep

5 jobs for master in 57 seconds (queued for 7 seconds)