Okay, I tried upgrading to diablo without a prior clean re-flash. I only had a few things installed, none of the off-limits ones (like modest), and now I'm in a reboot loop.... So, at this point, I don't recommend trying diablo unless you're willing to reflash first (or unless you're dual-booting and willing to debug a reboot loop).