Merging manually changes from https://github.com/cfengine/documentation/pull/383