Merged in master-configtest/shizu.py by hand