Sync with master

Add info about keeping a fork synced