Fix regression from eb42232311c70fa9864794487680b1030f4c06fd
Merge branch 'release-1.0' of github.com:rapila/cms-base into release-1.0