Merging Jake's latest changes

Getting the repos into sync.