Merge with the latest folsom