3.5.x to 3.6.x sync [reference, do not merge] - #2541

3.5.x to 3.6.x sync [reference, do not merge]#2541

Seiger merged 10 commits into

3.6.xevolution-cms/evolution:3.6.xfrom

3.5.xevolution-cms/evolution:3.5.xCopy head branch name to clipboard