Merge changes from old SVN into new one
Authored by: fweispf 2013-11-19
Parent: [r1116]
Child: [r1118]