[FIX] multiple backports from Tiki 13

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