Merge branch 'idle.2013.09.25a' into HEAD