Merge branch 'edge' of https://github.com/errolt/Smoothieware into edge
authorErrol <errol@errolsworld.com>
Tue, 10 Nov 2015 13:56:07 +0000 (15:56 +0200)
committerErrol <errol@errolsworld.com>
Tue, 10 Nov 2015 13:56:07 +0000 (15:56 +0200)

Trivial merge