Organized a little bit; merged in some items from the 1.5.2p2 branch that
did not get handled.
1 file changed