merge folsom changes

merge all outstanding folsom changes from master.