Merge branch 'master' of marples:/var/git/openresolv