Possible fix for discussions/400284
Merge branch 'master' of https://github.com/n2cms/n2cms