[MRG] Automatic merge, trunk 46914 to 46919
Conflicts resolved manually ("accept theirs")


git-svn-id: file:///var/local/code.tiki.org/tikisvn/branches/experimental@46920 b456876b-0849-0410-b77d-98878d47e9d5