- includes all changes up to 'fix inheritance order' from git_mlz 6a32ecf34224c559ae558efd7c0d20078d09463b Change-Id: Ie3ceee3dbd0a9284b47b1d5b5dbe262eebe8f283
Change-Id: I68b8ba9311ec0487d7a2676095a7170a2447b3d0 Reviewed-on: https://forge.frm2.tum.de/review/20206 Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de> Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>