Merged revisions 2880-2883,2885-2895 via svnmerge from