Merge remote-tracking branch 'mfischer/acpid' into next