This is a merge without conflicts: 2f994ec..c71d217 stable-2.4 -> stable-2.4
René
- [Merge] devel-2.4 into stable-2.4 Iustin Pop
- Re: [Merge] devel-2.4 into stable-2.4 Rene Nussbaumer
- [MERGE] devel-2.4 into stable-2.4 René Nussbaumer
- Re: [MERGE] devel-2.4 into stable-2.4 Iustin Pop
