#1354 Fixed fix
Merge branch 'master' of https://github.com/CrazyPants/EnderIO