Item12312: Item12314:   Sync from Release01x01

git-svn-id: http://svn.foswiki.org/trunk@16500 0b4bb1d4-4e5a-0410-9cc4-b2b747904278