Merge "upstream" fixes from SIPB's snippets
-rw-r--r-- 3250 __init__.py