sync the freebird branch on GigaOM

sync sync sync