Summary of changes: 383d596... Revert "Merge branch 'master' into f12" (*) 8358acc... readded makefile (*) (*) This commit already existed in another branch; no separate mail sent