2.15.5

svn path=/trunk/; revision=6503
2.15.5

svn path=/trunk/; revision=6503
95 files changed