[MRG] Automatic merge, branches/17.x 63605 to 63607
[MRG] Automatic merge, branches/17.x 63605 to 63607

git-svn-id: a7fabbc6a7c54ea5c67cbd16bd322330fd10cc35@63608 b456876b-0849-0410-b77d-98878d47e9d5

tikiorg/tiki,tikiorg/tiki,tikiorg/tiki,tikiorg/tiki