Merge branch 'master' of github.com:cfengine/core