Update fork to current version of master