Fork is compatible with Hub
Merge branch 'fork_compat'