Merge "Fix zhtable's Makefile.py"