Pull bugfix into test branch

Conflicts:

	kernel/power/disk.c