Update to latest m4 master.