Refactor to parts of fabfile.
Merge remote-tracking branch 'origin/develop' into develop