Merge commit 'de2d8f9ac37914b38e40e24bf16f9750d6748530' into merge_common
Squashed 'floo/common/' changes from a6b9354..caf8dcf

caf8dcf Use new link editor URL.
7d866f6 Except exception.

git-subtree-dir: floo/common
git-subtree-split: caf8dcf35c980c2311497693d469b648138df0f8
Need codename for new common python stuff.
Squashed 'floo/common/' changes from caf8dcf..2cf6293

2cf6293 Apparently Sublime Text 2 on Linux explodes if you import io. Work around yet another Sublime Text bug.

git-subtree-dir: floo/common
git-subtree-split: 2cf62939887ebebd6a146abd50d0e6660380dee1
Merge commit '30529217d764143a270147ae364e570ddc1c9361' into merge_common