Merge everything into Jonathan's master to bring it up to date