Merging 2.4 back into trunk

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


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