#1026 Machine dupe
Merge branch 'master' of https://github.com/CrazyPants/EnderIO.git