Merge branch 'master' of oom