cfengine/core — pull request #1895 by ediosyncratic (2014-08-08 13:01:26+00:00)
Title: Synchronise master with @markburgess's recent development work.

This is my current version of Mark's branch, that I hope to be able to merge this afternoon, subject to testing.