Squashed 'floo/common/' changes from 083180d..c3d0773

c3d0773 Fix stuff. Delete stuff.

git-subtree-dir: floo/common
git-subtree-split: c3d0773182a7b37abd36be3fcadf69dc4d5be1d8
Merge commit 'dcfbef7f777b28efe066e46a7f68b241f4ec5490' into use_common_py