final commit before continuing with restructuring...
Authored by: kaddoura 2014-11-12
Parent: [r31001]
Child: [r31003]