no longer rely on at-daemon
Merge branch 'master' into 2.x