Merge master
Update Tekkit
Fix for old Bukkit