Backported fix for #362.
Merge branch 'OC1.2-MC1.6' of github.com:MightyPirates/OpenComputers into OC1.2-MC1.7