Squashed 'floo/common/' changes from 60cd127..4ce847b

4ce847b Fix imports for Python 3

git-subtree-dir: floo/common
git-subtree-split: 4ce847b49c78008866704b4dd6628f9b84e1b5fa
Merge commit '90ebbd85ba8189a1e00d89da076355516459ad6f'