Cleanup main Makefile a bit more
Merge branch 'stable' into playground