Bring janpub:n2cms/master up to date (and resolve merge conflicts)

How else could people continue to take advantage of this work? :smile: