Get changes from upstream into Jenny's fork