Merge branch 'makefile' into haiku