Fixed buttons, they now work with Bukkit plugins again
Merge origin/master