#545 Crash with Conduit Probe
Merge branch 'master' of https://github.com/CrazyPants/EnderIO