cleanups, bug fixes, and improvements
Authored by: laemmel 2014-10-31
Parent: [r30854]
Child: [r30856]