roll forward master into machinekit

this should bring in git.linuxcnc.org/master up to b5fecea