Update to latest make system
Merge branch 'feature-update-makesystem'