Some more changes and corrections from Steven M. Schultz for the release
Authored by: waldviertler 2013-09-21
Parent: [r3336]
Child: [r3338]