For PR automake/369: