Merge pull request #511 from Smoothieware/edge

merge edge into master
Merge remote-tracking branch 'upstream/master' into edge