Import fab changes from master.
Import requirements changes from master.