Merge branch 'idle.2013.09.25a' into HEAD

idle.2013.09.25a: Topic branch for idle entry-/exit-related changes.