Add changes from the 2.5.x branch to the master branch

[phaidon]

@craigh @hvorragend @nmpetkov

Is this merge okay?

I want to merge the 2.5.x branch into the master branch, because imho it makes no sense that we have 2 branches with the same content. At least not at the moment.

[ghost]

Have you diffed the two?

https://github.com/zikula-modules/Pages/compare/release-2.5.x...master

[ghost]

I ran a merge.