Merged master changes into the bukkit branch.