MERGING 2.4 into 3.0

git-svn-id: http://sunny.svnrepository.com/svn/sunny-side-up-general/metatags/branches/3.0@5000 7b40dde9-fc51-43d4-b609-63a66f0a0cee


git-svn-id: http://sunny.svnrepository.com/svn/sunny-side-up-general/metatags/branches/3.0@5001 7b40dde9-fc51-43d4-b609-63a66f0a0cee


git-svn-id: http://sunny.svnrepository.com/svn/sunny-side-up-general/metatags/branches/3.0@5008 7b40dde9-fc51-43d4-b609-63a66f0a0cee