merge -r 5781:6237 of STABLE_copy
NOTE: This is a mess because it introduces more SVN keywords which should be cleared from he code.