changes which were not integrated because they were external

Change-Id: Icaf0929d61e473a6a8940298a134015e1303b441
Merge branch 'master' of http://gerrit.mni.thm.de/gerrit/lib_thm_core