Sync 3.5 to 3.6 - #2534

Sync 3.5 to 3.6#2534

Seiger merged 12 commits into

evolution-cms:3.6.xevolution-cms/evolution:3.6.xfrom

elcreator:sync-3.5-to-3.6elcreator/evolution:sync-3.5-to-3.6Copy head branch name to clipboard