Merge branches 'release', 'acpi_pm_device_sleep_state' and 'battery' into release