[PATCH 2/2] Updates for Automake 1.13.