Merge branch 'master' of www.opencode.net:dfn2/ocs-manager

1 job for master in 7 minutes and 40 seconds (queued for 1 second)