Merge branch 'edge' of https://github.com/Smoothieware/Smoothieware into edge
authorVictor Bolshakov <vb@devacon.eu>
Sat, 25 Feb 2017 09:04:36 +0000 (12:04 +0300)
committerVictor Bolshakov <vb@devacon.eu>
Sat, 25 Feb 2017 09:04:36 +0000 (12:04 +0300)

Trivial merge