Merge branch 'jt/itimer-autoconf'