check in after finishing work on thesis - minor refactorings
Authored by: ziemke 2013-12-19
Parent: [r27276]
Child: [r27278]