svn path=/trunk/; revision=18196
svn path=/trunk/; revision=15910
DIS dissection. svn path=/trunk/; revision=14899