mhaberler/unified-build-candidate-3 rebased onto machinekit/master

I think this is ok as a starting point.

Current with g.l.o master as of today, and runtests ok on all platforms I have.