cfengine/core — pull request #1770 by kacfengine (2014-06-25 14:27:51+00:00)
Title: 3.6.x Cherry picks

I've gone through all of my changes, plus all external contributors.