Re-generated the Makefiles
Merge branch 'master' into khorben-lm32