[MRG] Automatic merge, branches/15.x 58089 to 58093 Tree conflicts marked as resolved
[MRG] Automatic merge, branches/15.x 58089 to 58093
Tree conflicts marked as resolved


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

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