Combined fix 2#126

emiltoteb wants to merge 8 commits intokiwitcms:sourcekiwitcms/kiwitcms.github.io:sourcefrom

emiltoteb:emiltoteb_combined_fixemiltoteb/kiwitcms.github.io:emiltoteb_combined_fixCopy head branch name to clipboard