Timer, niveau.
Merge branch 'master' into server_plugging