Manually merged in Agro's changes from today. (This is the last manual merge.)