Merge branch 'edge' of https://github.com/Smoothieware/Smoothieware into edge
authorErrol <errol@errolsworld.com>
Wed, 11 Nov 2015 09:11:00 +0000 (11:11 +0200)
committerErrol <errol@errolsworld.com>
Wed, 11 Nov 2015 09:11:00 +0000 (11:11 +0200)

Trivial merge